Skip to content

ARO-14354,ARO-14356,ARO-14355: introduce image registry capability behind feature gate - #5456

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
flavianmissi:reconcile-capabilities-ARO-14354
Mar 12, 2025
Merged

ARO-14354,ARO-14356,ARO-14355: introduce image registry capability behind feature gate#5456
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
flavianmissi:reconcile-capabilities-ARO-14354

Conversation

@flavianmissi

@flavianmissi flavianmissi commented Jan 22, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

What this PR does / why we need it:
We're introducing the concept of capabilities to Hypershift on a limited basis, as described in openshift/enhancements#1729.

This PR implements the changes necessary to disable the image registry capability at hosted cluster install time.

** What changed **

The changes listed below are what to expect when creating a HostedCluster with the Image Registry capability disabled (TODO: explain how to do this).

  • ClusterVersion capabilities are set to the current set of capabilities (taken from openshift/api)
  • The image-registry operator and its associated resources are not created or reconciled
    • Resources include but are not limited to: operator pods, certificates, cloud credentials, pvc, configs.imageregistry.operator.openshift.io, image registry pods, relevant service accounts, cluster roles and bindings, etc.
  • openshift-controller-manager's pull-secrets controller is disabled
  • WIP

Which issue(s) this PR fixes
Fixes #ARO-14354

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

@openshift-ci
openshift-ci Bot requested review from enxebre and hasueki January 22, 2025 10:37
@openshift-ci openshift-ci Bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Jan 22, 2025
@flavianmissi flavianmissi changed the title hcco: explicitly set cluster version capabilities to vCurrent ARO-14354: hcco: explicitly set cluster version capabilities to vCurrent Jan 22, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 22, 2025
@openshift-ci-robot

openshift-ci-robot commented Jan 22, 2025 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown

@flavianmissi: This pull request references ARO-14354 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

Details

In response to this:

What this PR does / why we need it:
We're introducing the concept of capabilities to Hypershift on a limited basis, as described in openshift/enhancements#1729.
To make our plan work, we need to be explicitly when reconciling the cluster version's capabilities field. This PR is an attempt to accomplish this.

The code here will work without any of the API changes described in the EP. It's also easy to refactor it to incorporate the necessary changes once we have our API changes in place.

Which issue(s) this PR fixes
Fixes #ARO-14354

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot

openshift-ci-robot commented Jan 22, 2025 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown

@flavianmissi: This pull request references ARO-14354 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

Details

In response to this:

What this PR does / why we need it:
We're introducing the concept of capabilities to Hypershift on a limited basis, as described in openshift/enhancements#1729.
To make our plan work, we need to be explicit when reconciling the cluster version's capabilities field. This PR is an attempt to accomplish this.

The code here will work without any of the API changes described in the EP. It's also easy to refactor it to incorporate the necessary changes once we have our API changes in place.

Which issue(s) this PR fixes
Fixes #ARO-14354

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@flavianmissi
flavianmissi force-pushed the reconcile-capabilities-ARO-14354 branch from eb83f88 to c52c94e Compare January 22, 2025 11:36
@openshift-ci-robot

openshift-ci-robot commented Jan 22, 2025 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown

@flavianmissi: This pull request references ARO-14354 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

Details

In response to this:

What this PR does / why we need it:
We're introducing the concept of capabilities to Hypershift on a limited basis, as described in openshift/enhancements#1729.
To make our plan work, we need to be explicit when reconciling the cluster version's capabilities field. This PR is an attempt to accomplish this.

The code here will work without any of the API changes described in the EP. It's also easy to refactor it to incorporate the necessary changes once we have our API changes in place.

Which issue(s) this PR fixes
Fixes #ARO-14354

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@flavianmissi
flavianmissi force-pushed the reconcile-capabilities-ARO-14354 branch from c52c94e to 28b1028 Compare January 22, 2025 13:49
@openshift-ci openshift-ci Bot added area/api Indicates the PR includes changes for the API area/cli Indicates the PR includes changes for CLI area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release labels Jan 22, 2025
@flavianmissi
flavianmissi force-pushed the reconcile-capabilities-ARO-14354 branch 7 times, most recently from 3562281 to 7a0550a Compare January 28, 2025 14:39
@flavianmissi

flavianmissi commented Jan 28, 2025 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown
Member Author

/retitle ARO-14442,ARO-14354,ARO-14356,ARO-14355: introduce image registry capability behind feature gate

@openshift-ci openshift-ci Bot changed the title ARO-14354: hcco: explicitly set cluster version capabilities to vCurrent ARO-14442,ARO-14354,ARO-14356,ARO-14355: introduce image registry capability behind feature gate Jan 28, 2025
@openshift-ci-robot

openshift-ci-robot commented Jan 28, 2025 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown

@flavianmissi: This pull request references ARO-14442 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

This pull request references ARO-14354 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

This pull request references ARO-14356 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

This pull request references ARO-14355 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

Details

In response to this:

What this PR does / why we need it:
We're introducing the concept of capabilities to Hypershift on a limited basis, as described in openshift/enhancements#1729.
To make our plan work, we need to be explicit when reconciling the cluster version's capabilities field. This PR is an attempt to accomplish this.

The code here will work without any of the API changes described in the EP. It's also easy to refactor it to incorporate the necessary changes once we have our API changes in place.

Which issue(s) this PR fixes
Fixes #ARO-14354

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

enxebre
enxebre reviewed Jan 28, 2025
View reviewed changes
Comment thread api/hypershift/v1beta1/hosted_controlplane.go
enxebre
enxebre reviewed Jan 28, 2025
View reviewed changes
Comment thread control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go Outdated
enxebre
enxebre reviewed Jan 28, 2025
View reviewed changes
Comment thread api/hypershift/v1beta1/hosted_controlplane.go Outdated
@flavianmissi
flavianmissi force-pushed the reconcile-capabilities-ARO-14354 branch from 7a0550a to 9f6d657 Compare January 29, 2025 09:11
@flavianmissi
flavianmissi force-pushed the reconcile-capabilities-ARO-14354 branch from 337d75c to 91ce1f8 Compare March 6, 2025 17:50
@muraee

muraee commented Mar 6, 2025

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2025
@flavianmissi

flavianmissi commented Mar 10, 2025

Copy link
Copy Markdown
Member Author

/retest

@flavianmissi

flavianmissi commented Mar 10, 2025

Copy link
Copy Markdown
Member Author

all review comments have been addressed, removing the hold.
/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 10, 2025
@sjenning

sjenning commented Mar 10, 2025

Copy link
Copy Markdown
Contributor

Tested this manually and everything looks good 👍

  • No openshift-image-registry namespace in hosted cluster
  • No image-registry ClusterOperator in hosted cluster
  • configs.imageregistry.operator.openshift.io CRD exist but cluster config does not
  • No guest cluster SAs have imagePullSecret set
  • Guest cluster fully rolls out at the CVO and HC levels
  • image-registry-operator is not running in the HCP
  • OCM config in the HCP has serviceaccount-pull-secrets controller disabled
    controllers:
    - '*'
    - -openshift.io/serviceaccount-pull-secrets
...
    dockerPullSecret:
      internalRegistryHostname: ""
  • API validation/CEL works as expected too. I'm not able to change the capabilities after initial create.

@flavianmissi
introduce image registry capability behind feature gate
ad73458 
users running hypershift in tech preview can disable the image registry
capability by setting .spec.capabilities.disabledCapabilities:
["ImageRegistry"] in their hosted cluster resource.

at the moment of writing, the only supported capability is
"ImageRegistry".

it's only possible to set capabilities at hosted cluster creation time.
@flavianmissi
flavianmissi force-pushed the reconcile-capabilities-ARO-14354 branch from 91ce1f8 to ad73458 Compare March 11, 2025 09:19
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2025
@flavianmissi

flavianmissi commented Mar 11, 2025

Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@flavianmissi

flavianmissi commented Mar 11, 2025

Copy link
Copy Markdown
Member Author

/retest

@sjenning

sjenning commented Mar 11, 2025

Copy link
Copy Markdown
Contributor

re-adding @muraee lgtm and approving

/lgtm
/approve

testplatform is disrupted atm, leading to the test failures. Will monitoring for fix then retest.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2025
@openshift-ci

openshift-ci Bot commented Mar 11, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flavianmissi, sjenning

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 11, 2025
@openshift-ci-robot

openshift-ci-robot commented Mar 11, 2025

Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD 433f8c9 and 2 for PR HEAD ad73458 in total

@sjenning

sjenning commented Mar 11, 2025

Copy link
Copy Markdown
Contributor

/retest-required

@sjenning

sjenning commented Mar 11, 2025

Copy link
Copy Markdown
Contributor

/test okd-scos-e2e-aws-ovn

@openshift-ci-robot

openshift-ci-robot commented Mar 12, 2025

Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD 0f9ad74 and 1 for PR HEAD ad73458 in total

@sjenning

sjenning commented Mar 12, 2025

Copy link
Copy Markdown
Contributor

/retest-required

@flavianmissi

flavianmissi commented Mar 12, 2025

Copy link
Copy Markdown
Member Author

Konflux checks seem to be holding off the merge...

/retest

@flavianmissi

flavianmissi commented Mar 12, 2025

Copy link
Copy Markdown
Member Author

/retest-required

@flavianmissi

flavianmissi commented Mar 12, 2025

Copy link
Copy Markdown
Member Author

/test e2e-aws

@openshift-ci

openshift-ci Bot commented Mar 12, 2025

Copy link
Copy Markdown
Contributor

@flavianmissi: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 8e8d04d into openshift:main Mar 12, 2025
@jubittajohn jubittajohn mentioned this pull request Apr 1, 2025
Merged
@flavianmissi flavianmissi mentioned this pull request Apr 2, 2025
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@enxebre enxebre enxebre left review comments
@hasueki hasueki Awaiting requested review from hasueki
+2 more reviewers
@muraee muraee muraee left review comments
@tjungblu tjungblu tjungblu left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@sjenning sjenning

@enxebre enxebre

@muraee muraee

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api Indicates the PR includes changes for the API area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/testing Indicates the PR includes changes for e2e testing jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@flavianmissi @openshift-ci-robot @enxebre @muraee @sjenning @tjungblu @openshift-merge-robot